merge
authorIan Campbell <ian.campbell@xensource.com>
Tue, 27 Feb 2007 15:40:37 +0000 (15:40 +0000)
committerIan Campbell <ian.campbell@xensource.com>
Tue, 27 Feb 2007 15:40:37 +0000 (15:40 +0000)

Trivial merge